看板优化

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/controller/base/MesStationController.java

@@ -13,6 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@RequestMapping(MesCommonConstant.MES_YANFEN+"mesStation")
+@RequestMapping(MesCommonConstant.MES_YANFEN+"/mesStation")
 public class MesStationController extends BaseMesController<MesStation>{
 }

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ProductInspectionSubReportDaoImpl.java

@@ -59,8 +59,8 @@ public class ProductInspectionSubReportDaoImpl implements IProductInspectionSubR
         commonQueryHql.append("AND mes_qms_suspicious.organizeCode = :organizeCode ");
         commonQueryHql.append("AND mes_qms_suspicious.isDeleted = :isDeleted ");
         commonQueryHql.append("AND mes_qms_suspicious.isValid = :isValid ");
-        if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())){
+        if (!StringUtils.isEmpty(model.getInspectionStartDate()) && !StringUtils.isEmpty(model.getInspectionEndDate())){
-            commonQueryHql.append("AND mes_qms_suspicious.createDatetime BETWEEN :createDateTimeStart AND :createDateTimeEnd ");
+            commonQueryHql.append("AND mes_qms_suspicious.createDatetime BETWEEN :inspectionStartDate AND :inspectionEndDate ");
         }
         if(!StringUtils.isEmpty(model.getPartName())){
             commonQueryHql.append("AND mes_qms_suspicious.partName like :partName ");
@@ -86,9 +86,9 @@ public class ProductInspectionSubReportDaoImpl implements IProductInspectionSubR
         dataQuery.setParameter("organizeCode", model.getOrganizeCode());
         dataQuery.setParameter("isDeleted", CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue());
         dataQuery.setParameter("isValid", CommonEnumUtil.IS_VAILD.VAILD.getValue());
-        if (!StringUtils.isEmpty(model.getCreateDateTimeStart()) && !StringUtils.isEmpty(model.getCreateDateTimeEnd())){
+        if (!StringUtils.isEmpty(model.getInspectionStartDate()) && !StringUtils.isEmpty(model.getInspectionEndDate())){
-            dataQuery.setParameter("createDateTimeStart", model.getCreateDateTimeStart());
+            dataQuery.setParameter("inspectionStartDate", model.getInspectionStartDate());
-            dataQuery.setParameter("createDateTimeEnd", model.getCreateDateTimeEnd());
+            dataQuery.setParameter("inspectionEndDate", model.getInspectionEndDate());
         }
         if(!StringUtils.isEmpty(model.getPartName())){
             dataQuery.setParameter("partName", model.getPartName() + "%");

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/daoimpl/report/ShipmentDetailReportDaoImpl.java

@@ -102,7 +102,7 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
 
         // 动态添加其他查询条件
         if (!StringUtils.isEmpty(model.getShippingCode())) {
-            commonQueryHql.append("AND momd.shippingCode like :shippingCode ");
+            commonQueryHql.append("AND ms.shippingCode like :shippingCode ");
         }
         if (!StringUtils.isEmpty(model.getPartNo())) {
             commonQueryHql.append("AND momd.partNo like :partNo ");
@@ -111,19 +111,19 @@ public class ShipmentDetailReportDaoImpl implements IShipmentDetailReportDao {
             commonQueryHql.append("AND momd.custPartNo like :custPartNo ");
         }
         if (!StringUtils.isEmpty(model.getShippingType())) {
-            commonQueryHql.append("AND momd.shippingType = :shippingType ");
+            commonQueryHql.append("AND ms.shippingType = :shippingType ");
         }
         if (!StringUtils.isEmpty(model.getCustCode())) {
-            commonQueryHql.append("AND momd.custCode like :custCode ");
+            commonQueryHql.append("AND ms.custCode like :custCode ");
         }
         if (!StringUtils.isEmpty(model.getStartScanTimeStart()) && !StringUtils.isEmpty(model.getStartScanTimeEnd())) {
-            commonQueryHql.append("AND momd.startScanTime between :startScanTimeStart and :startScanTimeEnd ");
+            commonQueryHql.append("AND ms.startScanTime between :startScanTimeStart and :startScanTimeEnd ");
         }
         if (!StringUtils.isEmpty(model.getEndScanTimeStart()) && !StringUtils.isEmpty(model.getEndScanTimeEnd())) {
-            commonQueryHql.append("AND momd.endScanTime between :endScanTimeStart and :endScanTimeEnd ");
+            commonQueryHql.append("AND ms.endScanTime between :endScanTimeStart and :endScanTimeEnd ");
         }
         if (!StringUtils.isEmpty(model.getPublishTimeStart()) && !StringUtils.isEmpty(model.getPublishTimeEnd())) {
-            commonQueryHql.append("AND momd.publishTime between :publishTimeStart and :publishTimeEnd ");
+            commonQueryHql.append("AND ms.publishTime between :publishTimeStart and :publishTimeEnd ");
         }
 
         Query dataQuery = entityManager.createQuery(dataQueryHql.append(commonQueryHql).toString(), ShippingReportModel.class);