看板接口

src/main/java/org/jeecg/modules/fbsBasedate/controller/FbsPersonnelController.java

@@ -61,6 +61,7 @@ public class FbsPersonnelController {
 									  HttpServletRequest req) {
 		Result<IPage<FbsPersonnel>> result = new Result<IPage<FbsPersonnel>>();
 		QueryWrapper<FbsPersonnel> queryWrapper = QueryGenerator.initQueryWrapper(fbsPersonnel, req.getParameterMap());
+		queryWrapper.lambda().orderByDesc(FbsPersonnel::getCreateTime);
 		Page<FbsPersonnel> page = new Page<FbsPersonnel>(pageNo, pageSize);
 		IPage<FbsPersonnel> pageList = fbsPersonnelService.page(page, queryWrapper);
 		result.setSuccess(true);

src/main/java/org/jeecg/modules/fbsBasedate/entity/FbsPersonnel.java

@@ -70,4 +70,7 @@ public class FbsPersonnel implements Serializable {
 	/**排序*/
 	@Excel(name = "排序", width = 15)
 	private Integer sort;
+	/**岗位*/
+	@Excel(name = "岗位", width = 15)
+	private String post;
 }

src/main/java/org/jeecg/modules/fbsDispatchList/mapper/xml/FbsDispatchListMapper.xml

@@ -6,13 +6,19 @@
          SELECT <!--c.cWhName '仓库',a.cInvCode '物料编码',d.cInvName '物料名称',d.cInvStd '规格',
                 a.iQuantity - a.fOutQuantity '已做发货单未出库数据',b.dDate '到货日期'-->
                 c.cWhName warehouseName,a.cInvCode materialCode,d.cInvName materialName,d.cInvStd specs,
-                a.iQuantity - a.fOutQuantity sendSum,CONVERT(varchar(30),b.dDate,23) planSendDate,a.cItemName cItemName,a.cItemCode cItemCode
+                <!--a.iQuantity - a.fOutQuantity sendSum-->
+                a.iQuantity sendSum
+                ,CONVERT(varchar(30),b.dDate,23) planSendDate,a.cItemName cItemName,a.cItemCode cItemCode
         FROM
              DispatchLists a
              left join DispatchList b on a.DLID  = b.DLID
              left join Warehouse c on a.cWhCode = c.cWhCode
              left join Inventory d on a.cInvCode = d.cInvCode
-          where  (a.iQuantity - a.fOutQuantity) &gt; 0
+          where
+        <!--(a.iQuantity - a.fOutQuantity) &gt; 0-->
+              a.fOutQuantity =0
+              and a.iQuantity>0
+              AND datediff( MONTH, b.dDate, getdate ( ) ) = 0
 					order by b.dDate desc
 
     </select>
@@ -25,7 +31,10 @@
              left join DispatchList b on a.DLID  = b.DLID
              left join Warehouse c on a.cWhCode = c.cWhCode
              left join Inventory d on a.cInvCode = d.cInvCode
-          where  (a.iQuantity - a.fOutQuantity) &lt;= 0
-
+          where  (a.iQuantity - a.fOutQuantity) = 0
+          and a.iQuantity>0
+          AND a.fOutQuantity>0
+          AND a.iQuantity=a.fOutQuantity
+            AND datediff( MONTH, b.dDate, getdate ( ) ) = 0
     </select>
 </mapper>

src/main/java/org/jeecg/modules/fbsDispatchLists/mapper/xml/FbsDispatchListsMapper.xml

@@ -32,6 +32,7 @@
             substring( d.cDLCode, 3, 2 ) = substring( CONVERT ( VARCHAR ( 100 ), GETDATE ( ), 112 ), 3, 2 )
             AND d.cSTCode='01'
             AND ds.cItemCode <![CDATA[ <> ]]>  '0002'
+            and isnull(d.cMemo,'') <![CDATA[ <> ]]> '%补发货%'
         GROUP BY
             ds.cItemCode,
             substring( d.cDLCode, 5, 2 )

src/main/java/org/jeecg/modules/fbsMomOrder/controller/FbsMomOrderdetailController.java

@@ -8,6 +8,8 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.druid.util.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
@@ -330,7 +332,7 @@ public class FbsMomOrderdetailController {
 				 for(FbsMomOrderdetail fbsMomOrderdetail:fbsMomOrderdetailList){
 					 for(FbsWorkshopDispatchList fbsWorkingStatistics:fbsWorkingStatisticsList){
 						 if(fbsMomOrderdetail.getDefine12().equals(fbsWorkingStatistics.getProjectName())){
-							 fbsMomOrderdetail.setManHoursInvested(fbsWorkingStatistics.getManHoursCompleted()+"");
+							 fbsMomOrderdetail.setManHoursInvested(fbsWorkingStatistics.getManHoursCompleted());
 						 }
 					 }
 				 }

src/main/java/org/jeecg/modules/fbsMomOrder/mapper/xml/FbsMomOrderdetailMapper.xml

@@ -205,6 +205,7 @@
         LEFT JOIN mom_order m ON mo.MoId= m.MoId
         LEFT JOIN Inventory i ON mm.InvCode= i.cInvCode
 				where mm.Qty-mm.IssQty>0 and mo.RelsUser is NOT NULL
+				AND SUBSTRING ( m.MoCode, 3, 4 ) = SUBSTRING ( CONVERT ( VARCHAR ( 100 ), GETDATE( ), 112 ), 3, 4 )
 				ORDER BY m.MoCode
     </select>