设备领用代码提交

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -251,6 +251,7 @@ public class UdiRelevanceController extends BaseController {
     @PostMapping("/udiwms/udiinfo/selectProduct")
     public BaseResponse selectProduct(@RequestBody  FilterUdiRelRequest filterUdiRelRequest) {
         List<UdiRelevanceResponse> udiRelevanceResponses = null;
+        filterUdiRelRequest.setKey("1");
         udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiRelRequest);
         PageInfo<UdiRelevanceResponse> pageInfo;
         pageInfo = new PageInfo<>(udiRelevanceResponses);

src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java

@@ -122,6 +122,7 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
 
                     UdiRelevanceResponse udiRelevanceResponse = udiProductService.filterUdiInfoById(invProductId);
                     //查询库存详情
+                    deviceReceiveOrderDetailEntity.setNameCode(udiRelevanceResponse.getNameCode());
                     deviceReceiveOrderDetailEntity.setRelId(udiRelevanceResponse.getRelId());
                     deviceReceiveOrderDetailEntity.setOrderIdFk(addDetailRequest.getOrderIdFk());
                     deviceReceiveOrderDetailEntity.setSupId(udiRelevanceResponse.getUnitFk());

src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java

@@ -14,6 +14,7 @@ import com.glxp.api.constant.Constant;
 import com.glxp.api.constant.FileConstant;
 import com.glxp.api.dao.inv.DeviceReceiveOrderDao;
 import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity;
 import com.glxp.api.entity.inv.DeviceReceiveOrderEntity;
 import com.glxp.api.entity.purchase.SupCertEntity;
@@ -81,11 +82,13 @@ public class DeviceReceiveOrderServiceImpl implements DeviceReceiveOrderService
         if (null == deviceReceiveOrderEntity) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
+        AuthAdmin authAdmin =customerService.getUserBean();
         //生成单号
         String orderId = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.DEVICE_RECEIVE_ORDER, "yyyyMMdd"));
         deviceReceiveOrderEntity.setOrderId(orderId);
         deviceReceiveOrderEntity.setStatus(0);
         Date date = new Date();
+        deviceReceiveOrderEntity.setReceiveUser(authAdmin.getId() + "");
         deviceReceiveOrderEntity.setCreateTime(date);
         deviceReceiveOrderEntity.setUpdateTime(date);
         String userName = customerService.getUserBean().getUserName();

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -124,6 +124,11 @@
                 AND nameCode = #{uniqueNameCode}
             </if>
         </where>
+        <choose>
+            <when test="key !=null and key != '' ">
+                GROUP BY basic_udirel.id
+            </when>
+        </choose>
         ORDER BY modifyTime DESC
     </select>
     <select id="selectPackLevel" parameterType="java.lang.String"