供应商开发票

src/main/java/com/dk/mdm/mapper/report/ReportMapper.xml

@@ -1762,7 +1762,8 @@
                T."makeTime",
                T."whId",
                T."whName",
-               T."remarks"
+               T."remarks",
+               T."nonStdCode"
         FROM
             (
                 SELECT
@@ -1790,7 +1791,8 @@
                     tpo.make_time AS "makeTime",
                     tpoi.wh_id AS "whId",
                     tmw.wh_name AS "whName",
-                    tpoi.remarks AS "remarks"
+                    tpoi.remarks AS "remarks",
+                    tpoi.non_std_code AS "nonStdCode"
                 FROM
                     dkic_b.t_psi_order_item tpoi
                         LEFT JOIN dkic_b.t_psi_order tpo ON tpo.order_id = tpoi.order_id
@@ -1829,7 +1831,8 @@
                     tpob.make_time AS "makeTime",
                     NULL AS "whId",
                     NULL AS "whName",
-                    tpobi.remarks AS "remarks"
+                    tpobi.remarks AS "remarks",
+                    tpobi.non_std_code AS "nonStdCode"
                 FROM
                     dkic_b.t_psi_outbound_item tpobi
                     LEFT JOIN dkic_b.t_psi_outbound tpob ON tpob.out_id = tpobi.out_id
@@ -1837,7 +1840,8 @@
                     LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
                 WHERE
                     tpob.from_id =  #{id}::uuid
-                  AND tpob.out_type = '出库类型-销售出库' UNION ALL
+                  AND tpob.out_type = '出库类型-销售出库'
+                UNION ALL
                 SELECT
                     tpobi.out_id AS "id",
                     tpob.out_no AS "no",
@@ -1867,7 +1871,8 @@
                     tpob.make_time AS "makeTime",
                     NULL AS "whId",
                     NULL AS "whName",
-                    tpobi.remarks AS "remarks"
+                    tpobi.remarks AS "remarks",
+                    tpobi.non_std_code AS "nonStdCode"
                 FROM
                     dkic_b.t_psi_outbound_item tpobi
                     LEFT JOIN dkic_b.t_psi_outbound tpob ON tpob.out_id = tpobi.out_id
@@ -1875,7 +1880,8 @@
                     LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
                 WHERE
                     tpob.from_id =  #{id}::uuid
-                  AND tpob.out_type = '出库类型-销售出库退货' UNION ALL
+                  AND tpob.out_type = '出库类型-销售出库退货'
+                UNION ALL
                 SELECT
                     tmrp.rp_id AS "id",
                     tmrp.rp_no AS "no",
@@ -1901,7 +1907,8 @@
                     NULL AS "makeTime",
                     NULL AS "whId",
                     NULL AS "whName",
-                    tmrp.remarks AS "remarks"
+                    tmrp.remarks AS "remarks",
+                    NULL AS "nonStdCode"
                 FROM
                     dkic_b.t_mac_rec_pay tmrp
                 WHERE
@@ -2011,6 +2018,8 @@
         <result column="sumQuantity" property="sumQuantity"/>
         <result column="sumAmount" property="sumAmount"/>
         <result column="no" property="no"/>
+        <result column="whName" property="whName"/>
+        <result column="nonStdCode" property="nonStdCode"/>
     </resultMap>
     
     <!--采购跟踪表 明细查询-->
@@ -2046,6 +2055,8 @@
              ,T."sumQuantity"  AS list_sumQuantity
              ,T."sumAmount"  AS list_sumAmount
              ,T."no" AS list_no
+             ,T."whName" AS list_whName
+             ,T."nonStdCode" AS list_nonStdCode
         FROM
             (
                 SELECT
@@ -2076,9 +2087,12 @@
                      ,sys.f_remove_zero(tppi.item_qty) AS "itemQty"
                      ,tppi.remarks AS "remarks"
                      ,tpp.make_time AS  "makeTime"
+                     ,tmw.wh_name AS "whName"
+                     ,tppi.non_std_code AS "nonStdCode"
                 FROM
                     dkic_b.t_psi_purchase_item tppi
                         LEFT JOIN dkic_b.t_psi_purchase tpp ON tpp.pur_id = tppi.pur_id
+                        LEFT JOIN dkic_b.t_mst_warehouse tmw ON tpp.wh_id = tmw.wh_id
                         LEFT JOIN dkic_b.t_mst_goods_sku tmgs ON tmgs.sku_id = tppi.sku_id
                         LEFT JOIN dkic_b.t_mst_goods_brand tmgb ON tmgb.brand_id = tmgs.brand_id
                 WHERE
@@ -2115,6 +2129,8 @@
                     END AS "itemQty"
                         ,tpii.remarks AS "remarks"
                         ,tpi.make_time AS  "makeTime"
+                        ,NULL AS "whName"
+                        ,tpii.non_std_code AS "nonStdCode"
                 FROM
                     dkic_b.t_psi_inbound_item tpii
                     LEFT JOIN dkic_b.t_psi_inbound tpi ON tpi.into_id = tpii.into_id
@@ -2155,6 +2171,8 @@
                     END AS "itemQty"
                         ,tpii.remarks AS "remarks"
                         ,tpi.make_time AS  "makeTime"
+                        ,NULL AS "whName"
+                        ,tpii.non_std_code AS "nonStdCode"
                 FROM
                     dkic_b.t_psi_inbound_item tpii
                     LEFT JOIN dkic_b.t_psi_inbound tpi ON tpi.into_id = tpii.into_id
@@ -2192,6 +2210,8 @@
                         ,Null AS "itemQty"
                         ,Null AS "remarks"
                         ,tmrp.make_time AS  "makeTime"
+                        ,NULL AS "whName"
+                        ,NULL AS "nonStdCode"
                 FROM
                     dkic_b.t_mac_rec_pay tmrp
 

src/main/java/com/dk/mdm/service/ivt/TransferService.java

@@ -115,7 +115,7 @@ public class TransferService extends BaseService<Transfer> {
 	public ResponseResultVO<?> insert(TransferVO transferVO) {
 		// 转化实体
 		Transfer transfer = transferConvert.convertToPo(transferVO);
-		Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.Transfer.getName(), true);
+		Map<String, Object> codeMap = commonService.getUniqueNoteCode(Constant.docNameConstant.Transfer.getName(), false);
 
 		//判断调整类型 仓库调整
 		if(transferVO.getTransferType().equals(Constant.transferType.CHECK_TYPE_WH.getName())){

src/main/java/com/dk/mdm/service/mst/MoneyAccountService.java

@@ -139,7 +139,7 @@ public class MoneyAccountService extends BaseService<MoneyAccount> {
 		// 获取显示顺序
 		Integer displayNo = commonService.getMaxDisplayNo(Constant.DisplayNoTable.MONEYACCOUNT);
 		moneyAccount.setMacId(codeMap.get("outId").toString()).setMacCode(codeMap.get("outNote").toString()).setDisplayNo(displayNo);
-		if (moneyAccount.getFlgDefault()) { //如果新建的时候 这个设置成默认 那么把默认的 反写false
+		if (moneyAccount.getFlgDefault()!=null&& moneyAccount.getFlgDefault()) { //如果新建的时候 这个设置成默认 那么把默认的 反写false
 			//查询本公司 默认的资金账户
 			List<MoneyAccountResponse> itemList = moneyAccountMapper.selectByCond(new MoneyAccountQuery().setFlgDefault(true).setCpId(authUtils.getStaff().getCpId()).setFlgValid(true));
 			if (itemList.size() > 0) { //说明有 且只有一条