wms成品页面查询接口部分修改

op-modules/op-wms/src/main/java/com/op/wms/controller/WmsRuturnPutEmbryoController.java

@@ -0,0 +1,99 @@
+package com.op.wms.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.op.wms.service.IWmsProductPutService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.op.common.log.annotation.Log;
+import com.op.common.log.enums.BusinessType;
+import com.op.common.security.annotation.RequiresPermissions;
+import com.op.wms.domain.WmsRuturnPutEmbryo;
+
+import com.op.common.core.web.controller.BaseController;
+import com.op.common.core.web.domain.AjaxResult;
+import com.op.common.core.utils.poi.ExcelUtil;
+import com.op.common.core.web.page.TableDataInfo;
+
+/**
+ * 成品退货入库Controller
+ *
+ * @author Open Platform
+ * @date 2024-04-09
+ */
+@RestController
+@RequestMapping("/ruturn")
+public class WmsRuturnPutEmbryoController extends BaseController {
+    @Autowired
+    private IWmsProductPutService wmsProductPutService;
+
+/**
+ * 查询成品退货入库列表
+ */
+@RequiresPermissions("wms:ruturn:list")
+@GetMapping("/list")
+    public TableDataInfo list(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
+        startPage();
+        List<WmsRuturnPutEmbryo> list = wmsProductPutService.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo);
+        return getDataTable(list);
+    }
+
+//    /**
+//     * 导出成品退货入库列表
+//     */
+//    @RequiresPermissions("wms:ruturn:export")
+//    @Log(title = "成品退货入库", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
+//        List<WmsRuturnPutEmbryo> list = wmsRuturnPutEmbryoService.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo);
+//        ExcelUtil<WmsRuturnPutEmbryo> util = new ExcelUtil<WmsRuturnPutEmbryo>(WmsRuturnPutEmbryo. class);
+//        util.exportExcel(response, list, "成品退货入库数据");
+//    }
+//
+//    /**
+//     * 获取成品退货入库详细信息
+//     */
+//    @RequiresPermissions("wms:ruturn:query")
+//    @GetMapping(value = "/{id}")
+//    public AjaxResult getInfo(@PathVariable("id") String id) {
+//        return success(wmsRuturnPutEmbryoService.selectWmsRuturnPutEmbryoById(id));
+//    }
+//
+//    /**
+//     * 新增成品退货入库
+//     */
+//    @RequiresPermissions("wms:ruturn:add")
+//    @Log(title = "成品退货入库", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
+//        return toAjax(wmsRuturnPutEmbryoService.insertWmsRuturnPutEmbryo(wmsRuturnPutEmbryo));
+//    }
+//
+//    /**
+//     * 修改成品退货入库
+//     */
+//    @RequiresPermissions("wms:ruturn:edit")
+//    @Log(title = "成品退货入库", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
+//        return toAjax(wmsRuturnPutEmbryoService.updateWmsRuturnPutEmbryo(wmsRuturnPutEmbryo));
+//    }
+//
+//    /**
+//     * 删除成品退货入库
+//     */
+//    @RequiresPermissions("wms:ruturn:remove")
+//    @Log(title = "成品退货入库", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{ids}")
+//    public AjaxResult remove(@PathVariable String[] ids) {
+//        return toAjax(wmsRuturnPutEmbryoService.deleteWmsRuturnPutEmbryoByIds(ids));
+//    }
+}

op-modules/op-wms/src/main/java/com/op/wms/mapper/WmsRuturnPutEmbryoMapper.java

@@ -14,4 +14,11 @@ public interface WmsRuturnPutEmbryoMapper {
     WmsRuturnPutEmbryo selectWmsRuturnPutEmbryoByid(WmsRuturnPutEmbryo wmsRuturnPutEmbryo1);
 
     void insertWmsRuturnPutEmbryoMapperRecords(WmsRuturnPutEmbryo wmsProductPutRecords);
+    /**
+     * 查询成品退货入库列表
+     *
+     * @param wmsRuturnPutEmbryo 成品退货入库
+     * @return 成品退货入库集合
+     */
+    public List<WmsRuturnPutEmbryo> selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IWmsProductPutService.java

@@ -126,4 +126,6 @@ public interface IWmsProductPutService {
     WmsFpStorageNewsSn palletScanning(WmsFpStorageNewsSn wmsFpStorageNewsSn);
 
     String palletTransferConfirmation(WmsFpStorageNewsSn wmsFpStorageNewsSn);
+
+    List<WmsRuturnPutEmbryo> selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/WmsProductPutServiceImpl.java

@@ -1089,4 +1089,15 @@ public class WmsProductPutServiceImpl implements IWmsProductPutService {
         }
         return result1;
     }
+    /**
+     * 查询成品退货入库列表
+     *
+     * @param wmsRuturnPutEmbryo 成品退货入库
+     * @return 成品退货入库
+     */
+    @Override
+    @DS("#header.poolName")
+    public List<WmsRuturnPutEmbryo> selectWmsRuturnPutEmbryoList(WmsRuturnPutEmbryo wmsRuturnPutEmbryo) {
+        return wmsRuturnPutEmbryoMapper.selectWmsRuturnPutEmbryoList(wmsRuturnPutEmbryo);
+    }
 }

op-modules/op-wms/src/main/resources/mapper/wms/WmsRuturnPutEmbryoMapper.xml

@@ -221,4 +221,95 @@
             <if test="activeFlag != null">#{activeFlag},</if>
         </trim>
     </insert>
+
+    <sql id="selectWmsRuturnPutEmbryoVo">
+        select id, factory_code, product_order, wh_code, wa_code, wl_code, product_name, product_code, product_sort, speciFication  as speciFication, unit_of_measure, plan_quantity, put_quantity, status, SAP_status, SAP_proof, SAP_message, put_date, attr1, attr2, attr3, attr4, attr5, attr6, attr7, attr8, attr9, attr10, create_by, create_time, update_by, update_time from wms_ruturn_put_embryo
+    </sql>
+
+    <select id="selectWmsRuturnPutEmbryoList" parameterType="WmsRuturnPutEmbryo" resultMap="WmsRuturnPutEmbryoResult">
+        <include refid="selectWmsRuturnPutEmbryoVo"/>
+        <where>
+            <if test="factoryCode != null  and factoryCode != ''">
+                and factory_code = #{factoryCode}
+            </if>
+            <if test="productOrder != null  and productOrder != ''">
+                and product_order = #{productOrder}
+            </if>
+            <if test="whCode != null  and whCode != ''">
+                and wh_code = #{whCode}
+            </if>
+            <if test="waCode != null  and waCode != ''">
+                and wa_code = #{waCode}
+            </if>
+            <if test="wlCode != null  and wlCode != ''">
+                and wl_code = #{wlCode}
+            </if>
+            <if test="productName != null  and productName != ''">
+                and product_name like concat('%', #{productName}, '%')
+            </if>
+            <if test="productCode != null  and productCode != ''">
+                and product_code = #{productCode}
+            </if>
+            <if test="productSort != null  and productSort != ''">
+                and product_sort = #{productSort}
+            </if>
+            <if test="speciFication != null  and speciFication != ''">
+                and specification = #{speciFication}
+            </if>
+            <if test="unitOfMeasure != null  and unitOfMeasure != ''">
+                and unit_of_measure = #{unitOfMeasure}
+            </if>
+            <if test="planQuantity != null ">
+                and plan_quantity = #{planQuantity}
+            </if>
+            <if test="putQuantity != null ">
+                and put_quantity = #{putQuantity}
+            </if>
+            <if test="status != null  and status != ''">
+                and status = #{status}
+            </if>
+            <if test="sapStatus != null  and sapStatus != ''">
+                and SAP_status = #{sapStatus}
+            </if>
+            <if test="sapProof != null  and sapProof != ''">
+                and SAP_proof = #{sapProof}
+            </if>
+            <if test="sapMessage != null  and sapMessage != ''">
+                and SAP_message = #{sapMessage}
+            </if>
+            <if test="putDate != null ">
+                and put_date = #{putDate}
+            </if>
+            <if test="attr1 != null  and attr1 != ''">
+                and attr1 = #{attr1}
+            </if>
+            <if test="attr2 != null  and attr2 != ''">
+                and attr2 = #{attr2}
+            </if>
+            <if test="attr3 != null  and attr3 != ''">
+                and attr3 = #{attr3}
+            </if>
+            <if test="attr4 != null  and attr4 != ''">
+                and attr4 = #{attr4}
+            </if>
+            <if test="attr5 != null  and attr5 != ''">
+                and attr5 = #{attr5}
+            </if>
+            <if test="attr6 != null  and attr6 != ''">
+                and attr6 = #{attr6}
+            </if>
+            <if test="attr7 != null  and attr7 != ''">
+                and attr7 = #{attr7}
+            </if>
+            <if test="attr8 != null  and attr8 != ''">
+                and attr8 = #{attr8}
+            </if>
+            <if test="attr9 != null  and attr9 != ''">
+                and attr9 = #{attr9}
+            </if>
+            <if test="attr10 != null  and attr10 != ''">
+                and attr10 = #{attr10}
+            </if>
+        </where>
+    </select>
 </mapper>